Register create_custom_widget as an object-returning signal. (#344505,

2006-06-10  Matthias Clasen <mclasen@redhat.com>

        * gtk/gtkprintoperation.c: Register create_custom_widget as
        an object-returning signal.  (#344505, Marko Anastasov, patch
        by Christian Persch)

        * gtk/gtkmarshalers.list: Add the right marshaller.

diff --git a/ChangeLog b/ChangeLog
index ab1ef459f563fecf9495f3d6024c15502d1a61cc..7c02f13b137df116db8e997cd9ab859aec91cb3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-06-10  Matthias Clasen <mclasen@redhat.com>
 
+       * gtk/gtkprintoperation.c: Register create_custom_widget as 
+       an object-returning signal.  (#344505, Marko Anastasov, patch
+       by Christian Persch)
+
+       * gtk/gtkmarshalers.list: Add the right marshaller.
+
        * gtk/gtk.symbols:
        * gtk/gtkprintjob.[hc]: Register GtkPrintCapabilities as a
        flags type.  (#344504, Marko Anastasov)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ab1ef459f563fecf9495f3d6024c15502d1a61cc..7c02f13b137df116db8e997cd9ab859aec91cb3b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2006-06-10  Matthias Clasen <mclasen@redhat.com>
 
+       * gtk/gtkprintoperation.c: Register create_custom_widget as 
+       an object-returning signal.  (#344505, Marko Anastasov, patch
+       by Christian Persch)
+
+       * gtk/gtkmarshalers.list: Add the right marshaller.
+
        * gtk/gtk.symbols:
        * gtk/gtkprintjob.[hc]: Register GtkPrintCapabilities as a
        flags type.  (#344504, Marko Anastasov)

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index e089d1335115ca7255fff463a0ce94f6f82a3064..c11f42b741c5f0f426a3720ef9f25bc109e7bab6 100644 (file)
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -53,7 +53,7 @@ NONE:INT,BOOL
 NONE:INT,INT
 NONE:NONE
 NONE:STRING,INT,POINTER
-POINTER:VOID
+OBJECT:VOID
 STRING:DOUBLE
 VOID:DOUBLE
 VOID:BOOLEAN

diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 6d9821fd988e69b09d60377b94b89bc3aa04d203..512eae936a5cc14ed8135540f3659753b9f28393 100644 (file)
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -511,9 +511,9 @@ custom_widget_accumulator (GSignalInvocationHint *ihint,
   gboolean continue_emission;
   GtkWidget *widget;
   
-  widget = g_value_get_pointer (handler_return);
+  widget = g_value_get_object (handler_return);
   if (widget != NULL)
-    g_value_set_pointer (return_accu, widget);
+    g_value_set_object (return_accu, widget);
   continue_emission = (widget == NULL);
   
   return continue_emission;
@@ -773,8 +773,8 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPrintOperationClass, create_custom_widget),
                  custom_widget_accumulator, NULL,
-                 _gtk_marshal_POINTER__VOID,
-                 G_TYPE_POINTER, 0);
+                 _gtk_marshal_OBJECT__VOID,
+                 G_TYPE_OBJECT, 0);
 
   /**
    * GtkPrintOperation::custom-widget-apply: